From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 22 Mar 2008 00:20:39 +0000 (+0000)
Subject: * (bug 6813) Don't break HTML validator when using trackbacks
X-Git-Tag: 1.31.0-rc.0~48884
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=503daa72398be40041cca54c5085d680668c0a19;p=lhc%2Fweb%2Fwiklou.git

* (bug 6813) Don't break HTML validator when using trackbacks
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 95af539926..bd4e8e7ce2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -122,6 +122,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * PHP 5.3 compatibility fix for wfRunHooks() called with no parameters
 * (bug 6447) Trackbacks now work with transactional tables, if enabled
 * (bug 6892, 7147) Trackback error handling, optional fields more robust
+* (bug 6813) Don't break HTML validator when using trackbacks
 
 
 === API changes in 1.13 ===
diff --git a/includes/Title.php b/includes/Title.php
index 10987a2fd3..c07d971f76 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2895,7 +2895,12 @@ class Title {
 		$title = htmlspecialchars($this->getText());
 		$tburl = $this->trackbackURL();
 
-		return "
+		// Autodiscovery RDF is placed in comments so HTML validator
+		// won't barf. This is a rather icky workaround, but seems
+		// frequently used by this kind of RDF thingy.
+		//
+		// Spec: http://www.sixapart.com/pronet/docs/trackback_spec
+		return "<!--
 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"
          xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
          xmlns:trackback=\"http://madskills.com/public/xml/rss/module/trackback/\">
@@ -2904,7 +2909,8 @@ class Title {
    dc:identifier=\"$url\"
    dc:title=\"$title\"
    trackback:ping=\"$tburl\" />
-</rdf:RDF>";
+</rdf:RDF>
+-->";
 	}
 
 	/**